From 9ee20980495df01ceebcf58d6a419b8d1f015b09 Mon Sep 17 00:00:00 2001 From: "vh249@arcadians.cl.cam.ac.uk" Date: Mon, 23 May 2005 23:04:31 +0000 Subject: [PATCH] bitkeeper revision 1.1511.1.1 (4292617fUY_QU9fABo1c9En_PEDHQA) fix ARCH=i386 build Signed-off-by: Vincent Hanquez --- linux-2.6.11-xen-sparse/drivers/acpi/tables.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/linux-2.6.11-xen-sparse/drivers/acpi/tables.c b/linux-2.6.11-xen-sparse/drivers/acpi/tables.c index 79e956b832..745fcec789 100644 --- a/linux-2.6.11-xen-sparse/drivers/acpi/tables.c +++ b/linux-2.6.11-xen-sparse/drivers/acpi/tables.c @@ -565,6 +565,12 @@ acpi_table_get_sdt ( * * result: sdt_entry[] is initialized */ +#if CONFIG_XEN +#define acpi_rsdp_phys_to_va(rsdp_phys) (__fix_to_virt(FIX_ACPI_RSDP_PAGE) + \ + (rsdp_phys & ~PAGE_MASK)) +#else +#define acpi_rsdp_phys_to_va(rsdp_phys) __va(rsdp_phys) +#endif int __init acpi_table_init (void) @@ -581,8 +587,7 @@ acpi_table_init (void) return -ENODEV; } - rsdp = (struct acpi_table_rsdp *) (__fix_to_virt(FIX_ACPI_RSDP_PAGE) + - (rsdp_phys & ~PAGE_MASK)); + rsdp = (struct acpi_table_rsdp *) acpi_rsdp_phys_to_va(rsdp_phys); if (!rsdp) { printk(KERN_WARNING PREFIX "Unable to map RSDP\n"); return -ENODEV; -- 2.30.2